Sync'd branch integration/fx-team with upstream @ Wed Nov  5 16:56:04 PST 2014