From ffea7cd1930243ea7aa8144e65be8f9027b088e6 Mon Sep 17 00:00:00 2001
From: tux3 <barrdetwix@gmail.com>
Date: Mon, 23 Feb 2015 23:19:22 +0100
Subject: [PATCH] Cherry pick part of #1259