Merge pull request #615 from neheb/bmx7