Sync'd branch integration/fx-team with upstream @ Fri Nov  7 06:13:46 PST 2014