Handle input source maps correctly
Merge branch 'input-source-map'