Merge pull request #450 from dangowrt/bmx7-2018122901