Merge branch 'master' into devel

Conflicts:
R/bruvo.r