Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Fri, 6 May 2016 23:59:39 +0000 (17:59 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 6 May 2016 23:59:39 +0000 (17:59 -0600)

Trivial merge