Fixed zm_logger not including zm_config.h first.
Merge branch 'master' into cmake-testing