Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
form.js

EDITED
Merge pull request #5 from maximeHourtane/master

gfd