Merge with latest changes from master.