Merge branch 'hotfix/1.1.18' v1.1.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:39:20 +0000 (09:39 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 16 Apr 2015 13:39:20 +0000 (09:39 -0400)

Trivial merge