Sync'd branch integration/fx-team with upstream @ Mon Nov  3 11:41:44 PST 2014