#16978: rephrase sentence and fix typo.  Initial patch by Tshepang Lekhonkhobe.
#16978: merge with 3.2.
#16978: merge with 3.3.