Merged r14:17 of trunk to branch..