Devel to master, 1.3.39