Merge branch 'etm' into dtls

* etm:
  Fix some more warnings in reduced configs
  Fix typo causing MSVC errors