Merge change Idbdeed6b

* changes:
  doc change: fix build from bad merge. Add missing @jd:body