Merge pull request #11589 from alalek:calib3d_chessboard_fix