Merge branch 'hotfix/1.0.8'
authorSteve Sutton <steve@gaslightmedia.com>
Mon, 9 May 2016 21:11:10 +0000 (17:11 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Mon, 9 May 2016 21:11:10 +0000 (17:11 -0400)

Trivial merge