Merge branch 'master' into martin-t/dmgtext2
authorterencehill <piuntn@gmail.com>
Fri, 16 Jun 2017 21:22:31 +0000 (23:22 +0200)
committerterencehill <piuntn@gmail.com>
Fri, 16 Jun 2017 21:22:31 +0000 (23:22 +0200)

Trivial merge