Merge branch 'hotfix/1.0.30' v1.0.30
authorIan Weller <ian@gaslightmedia.com>
Thu, 9 Mar 2017 21:10:29 +0000 (16:10 -0500)
committerIan Weller <ian@gaslightmedia.com>
Thu, 9 Mar 2017 21:10:29 +0000 (16:10 -0500)

Trivial merge