Correct Timed Popup window behavior on F6 (Dimmer) (FS#1183)
Merge branch 'master' of https://github.com/OpenCPN/OpenCPN
Merge branch 'master' into refactoring

Conflicts:
	src/chcanv.cpp