Merge origin/master

Conflicts:
	manifest.mf
Merge origin/dev into dev
Merge origin/master

Conflicts:
	manifest.mf
Merge origin/dev into dev
Merge origin/master

Conflicts:
	manifest.mf