merge from 'master' branch of original repository.