Merge branch 'hotfix/1.0.19' v1.0.19
authorLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 19:34:46 +0000 (14:34 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 19:34:46 +0000 (14:34 -0500)

Trivial merge