A redirect just doesn't a redirect make...
Merge remote-tracking branch 'origin/master'