Sync'd branch integration/fx-team with upstream @ Mon Nov  3 03:13:49 PST 2014