Merge branch 'master' of https://github.com/stephen-webb/logging-log4cxx