minor cleanup
Merge branch 'master' into decoder-refactor

t message to explain why this merge is necessary,