Update .osx from upstream (mathiasbynens)