Committed to core-updates in bcdc13454c4afab37b650d4bbfa95e539060619f. -- Chris