Merge branch 'hotfix/1.1.18'
authorLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:29:52 +0000 (16:29 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 10 Jun 2016 20:29:52 +0000 (16:29 -0400)

Trivial merge