R1:26a007f879c2

Merge branch 'master' into redesign-2015