Merge branch 'hotfix/1.0.8' v1.0.8
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 2 Oct 2015 20:18:10 +0000 (16:18 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 2 Oct 2015 20:18:10 +0000 (16:18 -0400)

Trivial merge