Merge branch 'release-1.0'
RST link woe.
Merge branch 'master' into develop