Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Fri, 17 Jun 2016 16:00:10 +0000 (10:00 -0600)
committerBdale Garbee <bdale@gag.com>
Fri, 17 Jun 2016 16:00:10 +0000 (10:00 -0600)

Trivial merge