Whamcloud - gitweb
b=19706 porting patch for master.