Merge commit 'origin/master' into 0.5