Merge branch 'hotfix/1.0.18' v1.0.18
authorIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 17:42:36 +0000 (13:42 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 17:42:36 +0000 (13:42 -0400)

Trivial merge