Merge branch 'hotfix/1.0.19' V1.0.19
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Aug 2014 14:18:01 +0000 (10:18 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Aug 2014 14:18:01 +0000 (10:18 -0400)

Trivial merge