Bug 6664 - upgrade draft15 to draft16 - change media types