Merge branch 'BleedingEdge' into experimental
fix frigate xml attributes, they were malformed (and likely the reason it was commented out oh so long ago)
Merge branch 'experimental' into BleedingEdge