Merge branch 'hotfix/1.0.6'
authorIan Weller <ian@gaslightmedia.com>
Thu, 28 Jul 2016 17:58:01 +0000 (13:58 -0400)
committerIan Weller <ian@gaslightmedia.com>
Thu, 28 Jul 2016 17:58:01 +0000 (13:58 -0400)

Trivial merge