5.x-1.1
830d19c5 · Backporting two recent fixes from the 6.x-1.1 release: ·