Merge firewire branches to be released post v2.6.35