Merge branch 'release/1.0.31' v1.0.31
authorChuck Scott <cscott@gaslightmedia.com>
Mon, 19 Oct 2015 14:32:50 +0000 (10:32 -0400)
committerChuck Scott <cscott@gaslightmedia.com>
Mon, 19 Oct 2015 14:32:50 +0000 (10:32 -0400)

Trivial merge