Merge branch 'master' into bidirectional

This brings this branch up to speed with the previous work.

Signed-off-by: Laslo Hunhold <dev@frign.de>