Bug 1056905 - Platform parsing updates - r=Callek