Merge dev to master for setLogLevel patch