Merge branch 'hotfix/1.0.17' v1.0.17
authorIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 17:25:23 +0000 (13:25 -0400)
committerIan Weller <ian@gaslightmedia.com>
Mon, 5 Jun 2017 17:25:23 +0000 (13:25 -0400)

Trivial merge