Merge pull request #512 from aparcar/bmx7-7.1.1-2