Sync'd branch integration/fx-team with upstream @ Mon Nov 10 06:45:04 PST 2014