R1:14a395ed8e64

Merge branch 'master' into redesign-2015