Sync'd branch integration/fx-team with upstream @ Thu Nov  6 14:10:53 PST 2014