Merge branch 'master' into beta-improvements
Minor bug in packrat cache fixed
Merge branch 'beta-improvements'