Merge branch 'hotfix/1.0.10' v1.0.10
authorIan Weller <ian@gaslightmedia.com>
Mon, 10 Apr 2017 12:25:14 +0000 (08:25 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 10 Apr 2017 12:25:14 +0000 (08:25 -0400)

Trivial merge