Merge branch 'master' into halfandquarter

No match.