R1:b1b97dddc771

Merge branch 'master' into redesign-2015