Merge branch 'development' into dtls

* development:
  Fix missing/misplaced #include's