Merge branch 'hotfix/1.1.20' V1.1.20
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:12:38 +0000 (11:12 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:12:38 +0000 (11:12 -0500)

Trivial merge