Make merges against devel branch, not master.