Suggest the mako toolbar
Merge branch '3.0'