Fixing dictionary links.
Merge branch 'master' into charter