Updated with #6cd584772b from mediaelement flex_build branch