Add comment to explain redirect
Added reminder for .meta to work
Merge remote-tracking branch 'upstream/master'