merge build system changes from trunk to 8.09