R1:075f041becc4

Merge branch 'master' into redesign-2015