Merge branch 'hotfix/1.0.10' v1.0.10
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Dec 2015 22:16:15 +0000 (17:16 -0500)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 10 Dec 2015 22:16:15 +0000 (17:16 -0500)

Trivial merge