Merge branch 'hotfix/1.0.33' v1.0.33
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 17 Apr 2017 17:35:35 +0000 (13:35 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 17 Apr 2017 17:35:35 +0000 (13:35 -0400)

Trivial merge