Add Typhoon 2.0.6
Merge remote-tracking branch 'upstream/master'
Removing spec as per #12678
Make match master repo.
Merge pull request #12684 from jasperblues/master

Remove accidentally pushed spec.