Merge branch 'hotfix/1.0.12' v1.0.12
authorIan Weller <ian@gaslightmedia.com>
Tue, 20 Jun 2017 20:05:40 +0000 (16:05 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 20 Jun 2017 20:05:40 +0000 (16:05 -0400)

Trivial merge