correct quoting for rst
Merge branch 'master' into develop