Merge branch 'fix-var-tmp-perms' into 'master'