Mapserver: fixed inconsistencies int WMS GetFeatureInfo response
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/mapserver/qgswmsserver.cpp
Add line multi-labelling support to pal
Add repeat distance UI
Want to get split feature to work with a single point to split a line
add option to set max thread count
get/set max. thread count in QgsApplication
restrict to node
change qsettings in qgsoptions, not qgsapplication
box of a more reasonable size for a single point
code cleanup
Better snapping behavior
Add a new 'mask' feature renderer that can be used to invert polygon fills
Add missing .ui
Merge pull request #1215 from etiennesky/mtr_maxcpus

[FEATURE] add option to set max thread count
[layertree] Implement more flags for LayerTreeModel (reorder nodes, rename nodes)
[layertree] Do not show check box for nonspatial tables
[TRANSUP] pl: wcs
Merge pull request #1381 from Cracert/i18n

[TRANSUP] pl: wcs
Add new custom widgets (QgsSlider and QgsDial)
Modified versions of QSlider and QDial which show the current value

Fix #4417