Merge remote-tracking branch 'origin/kaucic'
Merge remote-tracking branch 'origin/kaucic'
Merge remote-tracking branch 'origin/master'
Resynchronize Workspaces (no significant changes)