Merge branch 'hotfix/1.0.9' v1.0.9
authorIan Weller <ian@gaslightmedia.com>
Thu, 5 Jan 2017 13:49:08 +0000 (08:49 -0500)
committerIan Weller <ian@gaslightmedia.com>
Thu, 5 Jan 2017 13:49:08 +0000 (08:49 -0500)

Trivial merge