Sync'd branch integration/fx-team with upstream @ Fri Nov  7 05:33:41 PST 2014