[Maria-developers] Rev 2778: Merge in file:///home/psergey/dev/5.1-merge-look/