Merge branch 'hotfix/1.0.18' v1.0.18
authorLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 22:28:57 +0000 (17:28 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 12 Jan 2017 22:28:57 +0000 (17:28 -0500)

Trivial merge