Forward-port 41b77bee9c9cef485d95e82f16f6365ed1cf2a13 from 1.0; fixes to VideoContent...