Merge remote-tracking branch 'upstream/pr/174'
authorStephen Sinclair <radarsat1@gmail.com>
Thu, 13 Dec 2018 22:44:30 +0000 (23:44 +0100)
committerStephen Sinclair <radarsat1@gmail.com>
Thu, 13 Dec 2018 22:44:30 +0000 (23:44 +0100)

Trivial merge