Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Tue, 6 Sep 2016 02:59:11 +0000 (20:59 -0600)
committerBdale Garbee <bdale@gag.com>
Tue, 6 Sep 2016 02:59:11 +0000 (20:59 -0600)

Trivial merge