Bring devel up to date with master.