Preparing release 2.0.7
Updating release date
Merge branch 'master' into 2.1

Conflicts:
	package.xml