Fix improper example referral in Example C of ManyToOneAndOneToOne section
Merge branch '2.3.x'