Synchronized with apache:master