Add support for dict style roledefs
Merge branch 'master' into 1098-int

Conflicts:
	sites/www/changelog.rst
Changelog tweaks