R1:1e3c49086ee3

Merge branch 'master' into redesign-2015