Merge branch 'master' into branch-1.5
authorBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 06:01:33 +0000 (00:01 -0600)
committerBdale Garbee <bdale@gag.com>
Wed, 10 Sep 2014 06:01:33 +0000 (00:01 -0600)

Trivial merge