Remerge (manual) with mathiasbynens repo and make things easier to merge for the future