Update common. Fixes scratchpad call category
Merge P2s OS X install updates