Catching up with Apache branch-0.8