Merge branch 'hotfix/1.0.33' v1.0.33
authorAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Feb 2017 17:22:43 +0000 (12:22 -0500)
committerAnthony Talarico <talarico@gaslightmedia.com>
Thu, 9 Feb 2017 17:22:43 +0000 (12:22 -0500)

Trivial merge