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