Merge branch 'hotfix/1.0.6' v1.0.6
authorIan Weller <ian@gaslightmedia.com>
Wed, 22 Feb 2017 19:31:39 +0000 (14:31 -0500)
committerIan Weller <ian@gaslightmedia.com>
Wed, 22 Feb 2017 19:31:39 +0000 (14:31 -0500)

Trivial merge