Merge branch 'hotfix/1.0.19' v1.0.19
authorIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 18:29:36 +0000 (14:29 -0400)
committerIan Weller <ian@gaslightmedia.com>
Tue, 3 May 2016 18:29:36 +0000 (14:29 -0400)

Trivial merge