Merge branch 'hotfix/1.0.10' v1.0.10
authorSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:55:59 +0000 (14:55 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Thu, 29 Sep 2016 18:55:59 +0000 (14:55 -0400)

Trivial merge