Sync'd branch integration/fx-team with upstream @ Thu Nov  6 12:55:50 PST 2014