Fix double free bug
Merge branch 'master' into sli

Conflicts:
	data-engine/NVidiaMonitorDataEngine.cpp