Excluded dependency was causing build errors
Merge remote-tracking branch 'apache/master'