Sync'd branch integration/fx-team with upstream @ Tue Nov  4 17:01:40 PST 2014