bugfix
Merge remote-tracking branch 'origin/master'

Conflicts:
	_locales/nl/messages.json
	manifest.json