forward-port repository changes from master