Fixed build issues with PR#45
Auto-merge | Integrating changes from apache/master