Merge pull request #383 from peternewman/trivial-fixes

Fix a bug I introduced
Fix a test error with the latest version for XCode.
Resync with trunk.
Merge branch 'master' of https://github.com/OpenLightingProject/ola into trivial-fixes