Preserve original tab labels (and fix tests)
Moved position of print page action
Merge branch 'master' into related-links-and-tidy