Fixup log message
Properly handle anchors for names containing dots and '
Merge branch 'master' into getting-started
Minor language/grammar tweaks