LOGCXX-500: Merge branch 'master' into LOGCXX-500