From: zhijun Ren <ren.zhijun_at_oracle.com>
Date: Sat, 28 Feb 2015 17:20:12 +0800

Hi Ed and Manfred,

Please help to review the code, will submit once you approved and then
will work on porting back to 2.2.8.

BR,
Zhijun