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