Fixes #7068
Merge pull request #7087 from mwerezak/master

Fixes #7086
Merge pull request #17 from Baystation12/master

Merge updates from Baystation12