Merge branch 'master' into ELEGANCE_26
Merge branch 'master' into ELEGANCE_26
Include FitVid for dynamically sized video
Merge branch 'ELEGANCE_26'