Merge branch 'hotfix/1.0.30' v1.0.30
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 23 Nov 2016 21:01:58 +0000 (16:01 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 23 Nov 2016 21:01:58 +0000 (16:01 -0500)

Trivial merge