Use 1.9 syntax
Merge branch 'master' into popen-spawn-opts