Merge branch 'hotfix/1.0.10' v1.0.10
authorSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Oct 2015 19:04:28 +0000 (15:04 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Tue, 27 Oct 2015 19:04:28 +0000 (15:04 -0400)

Trivial merge