initial 2.0.5 commit

Signed-off-by: Jonas Elbers <jonas@gcworld.de>