Merge branch 'hotfix/1.0.6' v1.0.6
authorIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 19:01:58 +0000 (15:01 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 22 Sep 2016 19:01:58 +0000 (15:01 -0400)

Trivial merge