Fixed #1104
Added missing condition
Merge pull request #308 from siad007/zipcomment

Fixes #1104
Alias master branch as 2.9.x for composer

This allows downstream composer.json files to install the master
branch as a development version of 2.9.* rather than having to
switch their requirement to dev-master.
Merge pull request #315 from acoulton/patch-1

Alias master branch as 2.9.x for composer
Related to ref #1069
Fixes #945 - handle concurrent errors/failures in the same run
Refs #945 - add missing test fixture
Merge pull request #318 from siad007/patch-1

Fixes #1069
Added missing throw annotations
Added missing return annotations
Fixed phpdocs
Some more clean up