Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 19:29:26 +0000 (14:29 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 4 Feb 2016 19:29:26 +0000 (14:29 -0500)

Trivial merge