Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 16:03:38 +0000 (12:03 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 26 Oct 2015 16:03:38 +0000 (12:03 -0400)

Trivial merge