update upstream-master
Merge branch 'cmv3' into nj/cmv3-hscroll-sidebar
Properly set inline editor min-height on initial load. Code review cleanup.