Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Jun 2016 13:27:19 +0000 (09:27 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 30 Jun 2016 13:27:19 +0000 (09:27 -0400)

Trivial merge