R1:7d7e13d79b86

Merge branch 'master' into redesign-2015