Fixed regression on active menu entry highlight
Merge branch 'jag/menu-highlight-fix'

Conflicts:
	main/core/ChangeLog