Whamcloud - gitweb
Merge fixes from b1_6 to HEAD.