remove log and update versions
Merge branch 'master' into 1.5.2

Conflicts:
	build.cfg