Merge branch 'hotfix/1.0.15' v1.0.15
authorLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:07:16 +0000 (14:07 -0500)
committerLaury GvR <laury@gaslightmedia.com>
Tue, 5 Jan 2016 19:07:16 +0000 (14:07 -0500)

Trivial merge