Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Thu, 16 Jul 2015 19:31:42 +0000 (13:31 -0600)
committerBdale Garbee <bdale@gag.com>
Thu, 16 Jul 2015 19:31:42 +0000 (13:31 -0600)

Trivial merge