More BS3 changes.
Merge branch 'master' of https://github.com/tnwae/rt38.net