Merge origin/master

Conflicts:
	dbtproj.cpp
	nbproject/private/private.xml