Merge branch 'master' of github.com:silinternational/google-api-php-client-mock