Merge branch 'master' in devel-3.0