Merge branch 'hotfix/1.0.10' into develop
authorIan Weller <ian@gaslightmedia.com>
Mon, 5 Oct 2015 19:36:14 +0000 (15:36 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 5 Oct 2015 19:36:14 +0000 (15:36 -0400)

Trivial merge