merge caused some problems with the auto-build, fixed now.. hopefully.