Merge commit 'c5544630250ec434e4dafaf17274e83865415120' into 0.11