7.x-1.2
3ace8b80 · merging changes from 7.x-1.1 ·