Fix another byte ordering issue
Merge branch 'master' into annotated-lt