From 44c5b596e7229d5c39db64c772c6c979f8f218ed Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sun, 16 Nov 2014 20:32:05 +0100
Subject: [PATCH] Cherry pick f3019a8111f25ef0400c287d851b992d4ca3d839