Sync'd branch integration/fx-team with upstream @ Wed Nov  5 05:31:36 PST 2014