Updating to current 2.8dev