Merge branch 'parameter-object' of github.com:davedevelopment/mockery into parameter-object

Conflicts:
	library/Mockery/Generator/StringManipulation/Pass/MethodDefinitionPass.php