Merge commit '815b1eb870ea5b1d28de5be768d49e95c776c846' * commit '815b1eb870ea5b1d28de5be768d49e95c776c846': Fix bug 3061769
This commit is contained in:
Merge commit '815b1eb870ea5b1d28de5be768d49e95c776c846' * commit '815b1eb870ea5b1d28de5be768d49e95c776c846': Fix bug 3061769