merge from master
Merge branch 'rebrand', remote branch 'origin' into rebrand-sidebar