Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 16:42:31 +0000 (11:42 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 20 Jan 2016 16:42:31 +0000 (11:42 -0500)

Trivial merge