sync with sf2.1
Merge pull request #1 from arthurpetit/master

Update form types