Sync'd branch integration/fx-team with upstream @ Thu Nov  6 23:13:42 PST 2014