upstream updated toolbarwrapper
Merge pull request #747 from hashashin/toolbarwrapperupdate

upstream updated toolbarwrapper