fix npe
Merge commit '312e329857da6316ca573d1bdc9f414ffa74c43c' into Dev

Conflicts:
	build.xml