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