Merge remote-tracking branch 'origin/master' into nailed_versions

Conflicts:
	buildout.cfg