Sync'd branch integration/fx-team with upstream @ Mon Nov 10 04:39:55 PST 2014