krlmlr Merge branch 'cran-2.2.1' into master