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