3.6 release

Signed-off-by: Thomas Graf <tgraf@suug.ch>