Merge branch 'hotfix/1.6.30' v1.6.30
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Apr 2017 12:40:20 +0000 (08:40 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 3 Apr 2017 12:40:20 +0000 (08:40 -0400)

Trivial merge