Sync'd branch integration/fx-team with upstream @ Sun Nov  2 23:58:43 PST 2014