Merge branch 'hotfix/1.0.19' v1.0.19
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 19:19:25 +0000 (15:19 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 19:19:25 +0000 (15:19 -0400)

Trivial merge