php://memory and php://temp.
Merge branch 'master' of github.com:evert/evert.github.com