Merge branch 'hotfix/1.0.16' v1.0.16
authorLaury GvR <laury@gaslightmedia.com>
Tue, 28 Jun 2016 18:44:28 +0000 (14:44 -0400)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 28 Jun 2016 18:44:28 +0000 (14:44 -0400)

Trivial merge