Merge branch 'the-merge' of github.com:X-R-G-B/R-Bus into the-merge

Merge branch 'the-merge' of github.com:X-R-G-B/R-Bus into the-merge #1703