Signed-off-by: Domen Kožar <domen@dev.si>
[Squashed commits to make git blame etc. more likely to work. -ED]