eliminated the last of the reorder warnings from gcc
Merge branch 'master' into hla