Merge master into HEAD

Conflicts:
	nbproject/project.xml