Merge branch 'scripting-daily' into master-trunc

Conflicts:
	APolGe/.classpath