Merge branch 'master' into 'feature/strong-typing'

# Conflicts:
#   composer.json
#   templates/button.php
#   templates/input-submit.php
#   templates/input-text-multiple.php
#   templates/input.php
#   templates/select.php
#   templates/textarea.php