Merge pull request #507 from aparcar/bmx7-7.1.1