Merge remote-tracking branch 'origin/master'

# Conflicts:
#	manifest.json
#	package.json
#	versions.json