Merge branch 'hotfix/1.0.31' v1.0.31
authorIan Weller <ian@gaslightmedia.com>
Thu, 22 Jun 2017 13:16:22 +0000 (09:16 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 22 Jun 2017 13:16:22 +0000 (09:16 -0400)

Trivial merge