Merge pull request #831 from pepr/master

[cs] synchronization with latest [en] finished
Merge branch 'master' of https://github.com/progit/progit.git