move file to satisfy R CMD build
Merge branch 'master' into full-test