Merge branch 'hotfix/1.0.30' 1.0.30
authorIan Weller <ian@gaslightmedia.com>
Wed, 5 Apr 2017 16:07:01 +0000 (12:07 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 5 Apr 2017 16:07:01 +0000 (12:07 -0400)

Trivial merge