Merge pull request #5578 from aparcar/bmx6-exporter