Correct DESCRIPTION for CRAN.
Merge branch 'master' into cran