Make the compressed toolbars work
Merge remote-tracking branch 'origin/0.2.x' into 0.2.x
Merge branch '0.2.x'