Merge branch 'hotfix/1.0.9' v1.0.9
authorIan Weller <ian@gaslightmedia.com>
Mon, 7 Nov 2016 18:27:54 +0000 (13:27 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 7 Nov 2016 18:27:54 +0000 (13:27 -0500)

Trivial merge