Merge the fixed devel branch with the broken master branch