Sync'd branch integration/fx-team with upstream @ Mon Nov  3 00:20:48 PST 2014