Again, with the permalinks
Merge remote-tracking branch 'origin/master'