Typos corrected, some commands clarified
Merge remote-tracking branch 'upstream/master' into nls_German
2.6