Merge branch 'hotfix/1.0.10' v1.0.10
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 31 May 2016 13:20:19 +0000 (09:20 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 31 May 2016 13:20:19 +0000 (09:20 -0400)

Trivial merge