Bring devel version up to date with master.