Merge pull request #2228 from jwillemsen/jwi-bmakeplatformsimplfiy