Merge changes from HanbBrake trunk.