rebase against origin/master
R-devel from Travis build 8