forgot to include these two
Merge remote-tracking branch 'origin/Bleeding-Edge' into missing-in-hand-icons