Sync'd branch integration/fx-team with upstream @ Fri Nov  7 09:20:49 PST 2014