Fix compiler warnings.
Merge branch 'master' into fix-compiler-warnings
Merge pull request #25 from apigee/fix-compiler-warnings

Fix compiler warnings