Changes from mavericks.