Merge commit 'a4c65e9'