Sync'd branch integration/fx-team with upstream @ Wed Nov  5 12:25:41 PST 2014