Reversing column mapping to be more appropriate.
Merge branch 'master' into gh-pages