Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:36:58 +0000 (13:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jul 2016 17:36:58 +0000 (13:36 -0400)

Trivial merge