From 4acc9ad288cc005127d1709adbb1134f6dab94c6 Mon Sep 17 00:00:00 2001
From: Andre F de Miranda <trixpan@users.noreply.github.com>
Date: Thu, 3 Nov 2016 02:29:11 +1100
Subject: [PATCH] This closes #1047