Merge branch 'hotfix/1.0.16' v1.0.16
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 22:00:41 +0000 (17:00 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 22:00:41 +0000 (17:00 -0500)

Trivial merge