Minor doc fixes.
Releasing 0.5.0.
Releasing 0.5.0
Merge branch 'release-0.5.0'
Merge branch 'master' into devel