Merge branch 'development' into dtls

* development:
  Include 1.2.12 release information in ChangeLog