Merge remote-tracking branch 'upstream/master'
Improve cm93 bitmap performance
Implement deferred/thread texture compression.
Revert "Implement deferred/thread texture compression."

This reverts commit 77fc96ea999b98fa90cbe4bbed0f0c35a820c6a8.
Correct and improve NMEA route and waypoint upload logic.
Improve qualification of GRIB config file parameters.
Merge remote-tracking branch 'upstream/master'
Remove useless code
Correct timeline position initialisation
Improve Cloud/Rainfall overlays Display (#FS1402)
Fix the build for platforms with stripped down wxWidgets configurations like Fedora
Merge pull request #142 from Ptizef/master

Some Grib_pi minor improvements
Implement deferred/thread texture compression.
Improve OpenGL texture memory management
3.3.1911
AIS target dialog add country name/code
Merge remote-tracking branch 'upstream/master'

Conflicts:
	include/options.h
	src/glChartCanvas.cpp
Revert "add button to rebuild the opengl texture cache"

This reverts commit 54e0ceaa5b737972e2681e200397bbdc827e49e5.

Conflicts:
	include/options.h