Merge changes in 'master' branch up to day.