Merge branch 'release-2.1' into WebExt

Conflicts:
	.gitignore


Signed-off-by: Michael 'Tekkla' Zorn <tekkla@tekkla.de>