Merge pull request #2 from CleverRaven/master

Merge changes from 16sep->25sep
Renamed Zhark to Jawed Terror
Merge pull request #9236 from tivec/zharks-and-zalmons

Zharks and zalmons
Merge branch 'master' into diaperfur