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)
commitfa8b676a577de663b8622d0e8f6ce3605576b977
treec27864026926dd5adefba091c70f5609859c9600
parentf58bf86ad5c181d3428e5ad1cb9b4ba9a85303ac
parent79c306a90943f00bd29a725fc25d3ee3fb3f0d34
Merge remote-tracking branch 'upstream/pr/174'