Merge branch 'hotfix/1.0.31' v1.0.31
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 16:50:37 +0000 (11:50 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 28 Dec 2016 16:50:37 +0000 (11:50 -0500)

Trivial merge