R1:3699253e49f6

Merge branch 'master' into redesign-2015