R1:57b898af9a53

Merge branch 'master' into redesign-2015