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