Add APC cache
Merge branch 'master' into upstream