Merge pull request #464 from danvk/sourcemap