mbq Merge branch 'devel'