Merge branch 'hotfix/1.0.10' v1.0.10
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 5 Nov 2015 16:56:01 +0000 (11:56 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 5 Nov 2015 16:56:01 +0000 (11:56 -0500)

Trivial merge