Merge "GM2 Icons (3 of (?3?))" into pi-dev