Bugfix: broke trips with my meta tags.
Merge branch 'master' into nz-bulk-uploader