Merge branch 'hotfix/1.1.19' V1.1.19
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:06:35 +0000 (11:06 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:06:35 +0000 (11:06 -0500)

Trivial merge