^ [#31231] Removed useless row id columns Edit. Thanks Peter van
Westen.
(Fix #1353)
code quality
 ^ [#31233] Complete move to Bootstrap tooltips. Thanks Peter van
Westen.
(Fix #1356)
Merge remote-tracking branch 'remotes/upstream/master' into patch-4

Conflicts:
	libraries/cms/html/grid.php