R1:65853817690d

Merge branch 'master' into redesign-2015