adjusted /var/folders issues
Merge branch 'master' into develop