Sync'd branch integration/fx-team with upstream @ Fri Nov  7 15:32:49 PST 2014