reverting whitespaces and merging in changes from trunk