Merge in a few outstanding minor improvements to webm support
These two changes were both previously submitted via the mailing list. They have been retested and updated and are ready to be committed.
These two changes were both previously submitted via the mailing list. They have been retested and updated and are ready to be committed.