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