1186bb1eca
Merge commit 'ae1ba650074ab7b9a73f4430c1fc3576a8199383' * commit 'ae1ba650074ab7b9a73f4430c1fc3576a8199383': Handle null in MatrixCursor.get*()