Merge remote-tracking branch 'origin/master'

Conflicts:
	META-INF/MANIFEST.MF