Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Mon, 4 Jul 2016 21:47:24 +0000 (23:47 +0200)
committerBdale Garbee <bdale@gag.com>
Mon, 4 Jul 2016 21:47:24 +0000 (23:47 +0200)

Trivial merge