Temp fork of roxygen2 to propose bug fix re issue 261