Sync'd branch integration/fx-team with upstream @ Wed Nov 12 18:25:00 PST 2014