Changes from mimmi20:garetjax-browscapphp-issue67