Fix to R_HOME paths on OS X
Merge branch 'development'