updated the 3.0 branch from the head branch - ready for alpha18