Sync'd branch integration/fx-team with upstream @ Mon Nov 10 02:15:58 PST 2014