Merge branches 'master' and 'temp'
.
.