Fixed documentation error for #267.
Merge branch 'master' into Annex60Sync