Merge branch 'hotfix/1.0.31' 1.0.31
authorIan Weller <ian@gaslightmedia.com>
Thu, 13 Apr 2017 15:28:11 +0000 (11:28 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 13 Apr 2017 15:28:11 +0000 (11:28 -0400)

Trivial merge