Merge remote-tracking branch 'origin/master'

# Conflicts:
#	dist/index.browser.js
#	dist/index.cli.js
#	dist/index.js
#	index.d.ts