Merge branch 'hotfix/1.0.19'
authorIan Weller <ian@gaslightmedia.com>
Mon, 28 Nov 2016 16:00:21 +0000 (11:00 -0500)
committerIan Weller <ian@gaslightmedia.com>
Mon, 28 Nov 2016 16:00:21 +0000 (11:00 -0500)

Trivial merge