Updates after a release
Merge commit '88acd18a26eef56aa10d2a16ae4d84c8ea771b0e' into develop

Conflicts:
	sub/README.md