Sync'd branch integration/fx-team with upstream @ Wed Nov  5 16:23:46 PST 2014