Merge branch 'develop'
version requirement for vagrant
workaround for rsync bug https://bugzilla.samba.org/show_bug.cgi?id=10995
small fixes in rsync filters
Merge branch 'master' into develop