Merge branch 'hotfix/1.0.33' v1.0.33
authorIan Weller <ian@gaslightmedia.com>
Tue, 28 Mar 2017 13:52:15 +0000 (09:52 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 28 Mar 2017 13:52:15 +0000 (09:52 -0400)

Trivial merge