Skip to content
This includes changes by Robin Muggenthaler.

@ki89lok also fixed a scope mistake of his.