Remove devel branch
Merge branch 'devel'