ca process, by reyk
Merge branch 'master' into portable