stability fixes and regression fix
Merge branch 'fixRegression'

Conflicts:
	timenowd/manager.cpp
changes for autobuilder