R1:09d392fdbb3c

Merge branch 'master' into redesign-2015