Update feeds to 2.x-dev