Update after ISO WG21/SG6 meeting discussions

svn path=/sandbox/; revision=83955