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