Sync'd branch integration/fx-team with upstream @ Mon Nov  3 19:37:54 PST 2014