Merge branch 'testthat-0.8'