Fix the build.
Merge pull request #437 from nomis52/master

Fix the build.
Merge remote-tracking branch 'remotes/upstream/master'

Conflicts:
	include/ola/io/Descriptor.h
Fixed merge fallout