re-do change from latest source-map dependency so tests pass
Merge branch 'master' into sauce