Merge branch 'hotfix/1.0.8' v1.0.8
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 19:39:56 +0000 (14:39 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 4 Feb 2016 19:39:56 +0000 (14:39 -0500)

Trivial merge