Merge branch 'hotfix/1.0.8' v1.0.8
authorSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 18:09:54 +0000 (13:09 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Fri, 6 Mar 2015 18:09:54 +0000 (13:09 -0500)

Trivial merge