marketplace

Switch trunk from 2.6 to 3.0