Merge branch 'release/minorpatch'
af patch
Merge branch 'master' of github.com:konigstiger/edge.uplink