Merge commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9' * commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9': Fix bug 3061544 and some clipping errors.
Merge commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9' * commit '41170a1a05830e6c9ec631d73043ccf1878dc0f9': Fix bug 3061544 and some clipping errors.