Commit 9f73e1f3353ea08ba91e4eceaec7346bc0a7d49c

Edward Thomson 2015-05-01T09:01:34

Merge pull request #3081 from leoyanggit/build_warnings Fix some build warnings