Merge branch 'hotfix/1.0.16' v1.0.16
authorLaury GvR <laury@gaslightmedia.com>
Mon, 13 Jun 2016 17:42:25 +0000 (13:42 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Mon, 13 Jun 2016 17:42:25 +0000 (13:42 -0400)

Trivial merge