Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 19:15:38 +0000 (15:15 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Fri, 25 Sep 2015 19:15:38 +0000 (15:15 -0400)

Trivial merge