Merge branch 'master' of cgit.shore.co.il:/srv/git/rcfiles