Sync'd branch integration/fx-team with upstream @ Wed Nov 12 10:34:04 PST 2014