Further markdown fixes
Correct a git command error
Merge branch 'master' into 'stable'