Sync'd branch integration/fx-team with upstream @ Wed Nov  5 10:18:10 PST 2014