Merge remote-tracking branch 'MHR/master' into mozipi

Conflicts:
	.gitignore