Merge branch 'master' into issue_251
Fix change log
Show tag names in lower case... please
Removed span tag as suggested by @hvelarde
Merge branch 'issue_251' into issue_253

Conflicts:
	docs/CHANGES.rst
Merge branch 'issue_253' into issue_255
Removed issue 251 into comments