Merge branch 'hotfix/1.1.18' V1.1.18
authorLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:03:44 +0000 (11:03 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 4 Dec 2015 16:03:44 +0000 (11:03 -0500)

Trivial merge