Routine MacPro
Merge remote-tracking branch 'origin/Macpro'