Pushed a very slightly modified version from /r/2346 (authored by Xenux) in
commit 1ae5bcc4a40d83966c6d0d31160ab86f8db009ea

Also fixes priority - it's not "minor", it's a feature request! ;-)