Merge remote-tracking branch 'origin/andrew'

Conflicts: css/core/about.css