Merged trunk, fixed conflict.