Don't remember if up to date so now it is
Shows only little parts of the real picture, but still shows something..
Merge branch 'master' into mixer
Merge branch 'master' into mixer
Stash apply