Sync'd branch integration/fx-team with upstream @ Thu Nov  6 18:40:49 PST 2014