Add source maps support.
Refactor source maps code.
Merge branch 'refs/heads/master' into topics/source-maps

Conflicts:
	package.json