Merge branch 'hotfix/1.0.9' into develop
authorIan Weller <ian@gaslightmedia.com>
Fri, 2 Oct 2015 20:12:49 +0000 (16:12 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 2 Oct 2015 20:12:49 +0000 (16:12 -0400)

Trivial merge