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