From be9e317000fadc9746f89fd12a0a45a418091f12 Mon Sep 17 00:00:00 2001
From: Andre F de Miranda <trixpan@users.noreply.github.com>
Date: Tue, 2 May 2017 18:48:48 +1000
Subject: [PATCH] This closes #584 (stalled) This closes #399 (superseded)