Update devel with latest changes in master.