changes due to yihui/knitr@f8c972683a8bfa6bf1f90006b14a3497132d89b6