Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 16:07:20 +0000 (12:07 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 10 Mar 2015 16:07:20 +0000 (12:07 -0400)

Trivial merge