Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:43:47 +0000 (11:43 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 7 Jan 2016 16:43:47 +0000 (11:43 -0500)

Trivial merge