Merge commit 'pan/master' into not-linux