From c3c370d118086ebd71f06161918bb0610521c886 Mon Sep 17 00:00:00 2001
From: tux3 <barrdetwix@gmail.com>
Date: Fri, 24 Apr 2015 22:56:46 +0200
Subject: [PATCH] Cherry-pick da084594d9b58a5cbaf2414efecac04700c72ab4 from
 #1523

Closes #1523