Devel merged from master