Merge branch 'develop'
Release 0.5.3

Thanks @tpetr for the fix
Remove need for # NOQA
Merge branch 'develop'

Conflicts:
	HISTORY.rst

I hate when I do this.