Merged in 'origin/master'.