Fixed firefox-launcher
Merge branch 'jag/fixed-firefox-launcher' into 3.4

Conflicts:
	extra/installer/ChangeLog