Merge branch 'hotfix/1.0.7' v1.0.7
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Jan 2016 21:01:04 +0000 (16:01 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 28 Jan 2016 21:01:04 +0000 (16:01 -0500)

Trivial merge