Merge branch 'hotfix/1.0.13' v1.0.13
authorIan Weller <ian@gaslightmedia.com>
Wed, 21 Jun 2017 20:32:05 +0000 (16:32 -0400)
committerIan Weller <ian@gaslightmedia.com>
Wed, 21 Jun 2017 20:32:05 +0000 (16:32 -0400)

Trivial merge