7.x-1.2
fc97e530 · Merged from master ·