R 3.0 ctd
Merge branch 'develop'