Merge branch 'hotfix/1.0.18'
authorLaury GvR <laury@gaslightmedia.com>
Thu, 18 Feb 2016 20:59:02 +0000 (15:59 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 18 Feb 2016 20:59:02 +0000 (15:59 -0500)

Trivial merge