Fix case where fields is null in global and defined in a builder
Merge pull request #546 from sescandell/fix-issue_536

Fix case where fields is null in global and defined in a builder.
Merge branch 'master' into feature-split_views