Merge git/master into webVIDEO

Conflicts:
	LICENSE