Merge branch 'hotfix/1.0.19' v1.0.19
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:39:12 +0000 (13:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:39:12 +0000 (13:39 -0400)

Trivial merge