Intrduced Scrutinizer fixes.
Merge branch 'develop'

Conflicts:
	spec/Cornford/Logical/LogicalSpec.php