workaround for hadley/testthat#102
Merge branch 'testthat-dev'