Merge branch 'master' into coursera
Merge remote-tracking branch 'swirldev/coursera' into coursera
DESCRIPTION and NAMESPACE fixed to pass devtools::check. They were probably corrupted in earlier, Byzantine sequence of merges and deletions.