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