Merge tag 'v0.4' into develop

drupal7
works with forms
works with forms
Merge branch 'release/v0.5'