up
Merge remote-tracking branch 'mbbill/shared_browser_fix' into shared_browser_fix