Merge branch 'apache:master' into libfix