Merge branch 'master' into total-cache-setup