Fix: Always make globals an object (Fixes #1049)
Merge pull request #1050 from jrajav/global-merge

Fix: Always make globals an object