Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Sat, 7 May 2016 00:11:01 +0000 (18:11 -0600)
committerBdale Garbee <bdale@gag.com>
Sat, 7 May 2016 00:11:01 +0000 (18:11 -0600)

Trivial merge