Merge branch 'hotfix/1.0.7'
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 25 Feb 2016 17:56:05 +0000 (12:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 25 Feb 2016 17:56:05 +0000 (12:56 -0500)

Trivial merge