Sync'd branch integration/fx-team with upstream @ Fri Nov  7 17:18:48 PST 2014