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

Trivial merge