Resync with trunk. Merge branch 'trivial-fixes' of https://github.com/peternewman/ola into trivial-fixes
Resync with trunk.
Merge branch 'trivial-fixes' of https://github.com/peternewman/ola into trivial-fixes

nightrune/ola,ld3300/ola,ld3300/ola,nightrune/ola,ld3300/ola,nightrune/ola,nightrune/ola,nightrune/ola,ld3300/ola,nightrune/ola,ld3300/ola,ld3300/ola,nightrune/ola,ld3300/ola