Sync'd branch integration/fx-team with upstream @ Fri Nov  7 06:10:53 PST 2014