Merge pull request #131 from ploetzma/master-next

Update firestone XML and patches needed for Firestone