changes due to yihui/knitr@b108bb3f153b6db4072327101bc6923c92058df5