Update from 7.x-1.3 on d.o