Rebase svn trunk r1920
Merge branch 'master' of https://github.com/fmbiete/Z-Push-contrib