update devel to match master