Update from 7.x-1.5 on d.o