From 4783dd072807bc75490db55a3384d225b6d21580 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Mon, 17 Nov 2014 17:35:57 +0100
Subject: [PATCH] Cherry pick pull request #793

Closes #793