R1:6af1c02f0625

Merge branch 'master' into redesign-2015