Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	changes/bug5090

bug5090 was already merged and corrected in the master branch's changelog.