Sync'd branch integration/fx-team with upstream @ Wed Nov  5 16:53:00 PST 2014