Merge branch 'hotfix/1.0.8' v1.0.8
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jun 2015 19:53:57 +0000 (15:53 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 9 Jun 2015 19:53:57 +0000 (15:53 -0400)

Trivial merge