Empty directories are now synced but not their files.
Merge remote-tracking branch 'origin/master'