grunt to optionally add spatial
grunt -> spatial
Merge remote branch 'upstream/master' into build-edge
name order switch
Merge pull request #420 from calvinmetcalf/build-edge

grunt to optionally add spatial