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