Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 19:38:01 +0000 (14:38 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 19:38:01 +0000 (14:38 -0500)

Trivial merge