Fix help type in the active form widget
Merge remote-tracking branch 'origin/stable' into stable
Merge remote-tracking branch 'origin/master' into stable