new prefork conditional support
Merge branch 'origin/master'