Merge branch 'hotfix/1.0.10' v1.0.10
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Oct 2015 20:06:35 +0000 (16:06 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 21 Oct 2015 20:06:35 +0000 (16:06 -0400)

Trivial merge