Merge commit 'window-manager/master'