Merge branch 'hotfix/1.0.6' 1.0.6
authorIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 15:30:00 +0000 (11:30 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 15:30:00 +0000 (11:30 -0400)

Trivial merge