changes due to yihui/knitr#654