Update from master, with stdlib hack
Style