Re-enable forms plugin.
Merge branch 'form' into 1.3