Merge branch 'hotfix/1.0.6' v1.0.6
authorIan Weller <ian@gaslightmedia.com>
Fri, 9 Jun 2017 15:43:10 +0000 (11:43 -0400)
committerIan Weller <ian@gaslightmedia.com>
Fri, 9 Jun 2017 15:43:10 +0000 (11:43 -0400)

Trivial merge