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