Fix inline toolbar
Merge branch 'master' into oja-br-mode