Fix the build.
Merge branch 'master' into e133-hacks

Conflicts:
	common/base/Logging.cpp
Merge branch 'e133-hacks' of github.com:nomis52/ola into e133-hacks