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