[Maria-developers] [Branch ~maria-captains/maria/5.1] Rev 2819: LPBUG#523593: Merge