7.x-1.0-beta2
75092527 · fixes from @Rob C and @ryanissamson for #1327270 ·