Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Tue, 5 Jul 2016 08:23:18 +0000 (10:23 +0200)
committerBdale Garbee <bdale@gag.com>
Tue, 5 Jul 2016 08:23:18 +0000 (10:23 +0200)

Trivial merge