Git now ignores C++ *.so and *.o
Merge remote branch 'origin/rcpp' into rcpp