Merge commit 'v0.10.4' into stable-0.10