Merge commit '05bba2f975e66505282f7472a80d2ef93c189a36' into master-2.6-ex