Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:53:39 +0000 (09:53 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Wed, 15 Jun 2016 13:53:39 +0000 (09:53 -0400)

Trivial merge