Merge branch 'hotfix/1.0.10' v1.0.10
authorIan Weller <ian@gaslightmedia.com>
Fri, 19 Aug 2016 13:22:45 +0000 (09:22 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 19 Aug 2016 13:22:45 +0000 (09:22 -0400)

Trivial merge