Merge branch 'master' into branch-1.6
authorBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 02:07:49 +0000 (19:07 -0700)
committerBdale Garbee <bdale@gag.com>
Mon, 11 Jan 2016 02:07:49 +0000 (19:07 -0700)

Trivial merge