Merging the most recent branch commit by hand

Merge commit '04acb79c6b538839bf9e8d14bb458363b2a32a85'

Author: eddelbuettel

R/Attributes.R

@@ -1089,7 +1089,8 @@ sourceCppFunction <- function(func, isVoid, dll, symbol) {
 .sourceCppPlatformCacheDir <- function(cacheDir) {
 
     dir <- file.path(cacheDir,
-                     paste(R.version$platform,
+                     paste("sourceCpp",
+                           R.version$platform,
                            utils::packageVersion("Rcpp"),
                            sep = "-"))
     if (!dir.exists(dir))