Merge branch 'hotfix/1.0.30' v/1.0.30
authorIan Weller <ian@gaslightmedia.com>
Tue, 11 Oct 2016 16:06:17 +0000 (12:06 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 11 Oct 2016 16:06:17 +0000 (12:06 -0400)

Trivial merge