Merge branch 'hotfix/1.0.19' v1.0.19
authorIan Weller <ian@gaslightmedia.com>
Wed, 28 Dec 2016 14:34:05 +0000 (09:34 -0500)
committerIan Weller <ian@gaslightmedia.com>
Wed, 28 Dec 2016 14:34:05 +0000 (09:34 -0500)

Trivial merge