Merge branch 'devel-0.9.0'