FIX: Incorrect revision number.
Merge branch 'master' into 11.x

Conflicts:
	simversion.h