Merge branch 'hotfix/1.0.16' v1.0.16
authorLaury GvR <laury@gaslightmedia.com>
Thu, 21 Sep 2017 20:36:14 +0000 (16:36 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Thu, 21 Sep 2017 20:36:14 +0000 (16:36 -0400)

Trivial merge