Refs #4644: Added commit a5fec0d5941792e6b583d0e462e65a1bbd672f0c again after merge quirk
Merge branch 'branches/rudder/2.11'