Merge branch 'development' into dtls

* development:
  Fix missing #define if PLATFORM_C not here