Merge branch 'hotfix/1.0.8' v1.0.8
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jan 2016 19:47:57 +0000 (14:47 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 22 Jan 2016 19:47:57 +0000 (14:47 -0500)

Trivial merge