Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Sun, 16 Aug 2015 15:53:40 +0000 (17:53 +0200)
committerBdale Garbee <bdale@gag.com>
Sun, 16 Aug 2015 15:53:40 +0000 (17:53 +0200)

Trivial merge