Merge branch 'hotfix/1.0.10' v1.0.10
authorIan Weller <ian@gaslightmedia.com>
Wed, 21 Jun 2017 19:00:39 +0000 (15:00 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 21 Jun 2017 19:00:39 +0000 (15:00 -0400)

Trivial merge