Merge branch 'hotfix/1.0.10' v1.0.10
authorSteve Sutton <steve@gaslightmedia.com>
Wed, 10 May 2017 13:32:06 +0000 (09:32 -0400)
committerSteve Sutton <steve@gaslightmedia.com>
Wed, 10 May 2017 13:32:06 +0000 (09:32 -0400)

Trivial merge