6.x-1.1
88c50876 · Backporting fixes from 7.x-1.x ·