Resync with trunk
Merge branch 'slotinfo' of https://github.com/peternewman/ola into e1.37-2

Conflicts:
	include/ola/rdm/ResponderHelper.h