Sync'd branch integration/fx-team with upstream @ Mon Nov  3 09:13:46 PST 2014