cleanup upstream tasks with regard to new next branch handling
Merge branch 'next'

Conflicts:
	config/rake.rb