Move required software
Merge branch 'master' into apache