Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
Merge pull request #1 from rbayliss/scrutinizer-patch-1

Merge scrutinizer fixes