Sync'd branch integration/fx-team with upstream @ Tue Nov  4 08:29:39 PST 2014