Remove AF_Forms compatibility layer.
Merge remote-tracking branch 'origin/master'