Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 18:24:42 +0000 (14:24 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 6 Jul 2016 18:24:42 +0000 (14:24 -0400)

Trivial merge