Possible fix for #933
Merge pull request #941 from oldhobbyist/fix-933

mbbdev - Possible fix for #933
Merge branch 'mbbdev' into lunadev