Add tooltip to map unit scale edit button
Improve map unit scale dialog title and add descriptive
Enable disabled simplification code after merge MTR (1-2)

Disable simplification of geometries in composer by default
Enable disabled simplification code after merge MTR (2-2)

Enable AntialiasingSimplification
#9480: New 'pointOnSurface' method for QgsGeometry
#9480: New option for CentroidFillSymbolLayerV2 to force centroid inside of polygons
#9480: Force label position inside of polygons in PAL labeling library
#9480: Add /Factory/ to pointOnSurface() method
#9480: Add GUI checkbox option in labeling
#9480: Add centroidInside to sip file
Make OSM DB metadata initialization in transaction
Check Sqlite version to switch metadata initialization parameter
Merge pull request #1238 from ahuarte47/Issue_9480

Fix bug #9480: Labels for polygon centroids should always originate inside a polygon
#9480: Move checkbox to within centroid frame in labeling gui
Bundle libminizip on Mac if used by osgdb_kml plugin of osgearth
[layertree] More doxygen docs
[layertree] Add note about used custom properties
Merge remote-tracking branch 'alvaro/Simplification_MTR'

Conflicts:
	python/core/qgsmapsettings.sip
[layertree] Rename childLayerIds() to findLayerIds()
[TRANSUP] pl: IdentifyResults