Hopefully fixed fitvid.
Merge master.