Merge branch 'hotfix/1.0.33' v1.0.33
authorIan Weller <ian@gaslightmedia.com>
Thu, 22 Jun 2017 20:29:57 +0000 (16:29 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 22 Jun 2017 20:29:57 +0000 (16:29 -0400)

Trivial merge