Bring design up to reality
rebased onto 73af591ea166d65b52664c008b5f8e7d31a1b04c
Pull-Request has been merged by ngompa
Bring design up to reality