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