Merge branch 'master' of https://github.com/OpenLightingProject/ola into e1.37-2
Merge branch 'e1.37-2' of https://github.com/peternewman/ola into e1.37-2