Fix Hudson build failures
Merge pull request #515 from eric-wu/develop

Fix Hudson build failures