Sync'd branch integration/fx-team with upstream @ Mon Nov  3 04:59:05 PST 2014