R1:b97d7dddc806

Merge branch 'master' into redesign-2015