Merge branch 'mbedtls-1.3' into development

* commit '23c0608':
  Fix bug in generate_code.pl
  Fix typo in contributor name (oops!)