Merge branch 'mf/apply-p-no-atoi'

"git apply -p<n>" parses <n> more carefully now. * mf/apply-p-no-atoi: apply.c: fix -p argument parsing