From 1dca6b04eaa76fe723095ae4d855ff26ebbbc365 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 12 Jul 2014 18:06:10 +0200
Subject: [PATCH] Rebased on master