Merge commit '92460a2db43ede844dccd880966de32ffc2a0164' into masterRemote

Conflicts:
	nbproject/build-impl.xml