(cherry-picked from commit aed48363a478e9767a374154d703d7c84857707b)

Conflict:
	projects/mozilla/control/npolibvlc.cpp