Taken into account @ediosyncratic's review.

(cherry picked from commit 8f377acd0e4ad4eab7b880220dc9bd07f609c2a8)
Merge remote-tracking branch 'upstream/3.6.x' into 3.6.x_surfsara