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