Merge branch 'hotfix/1.2.30' v1.2.30
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Aug 2016 16:01:38 +0000 (12:01 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 5 Aug 2016 16:01:38 +0000 (12:01 -0400)

Trivial merge