Prep for beta 4
Merge branch 'master' into forms