Sync'd branch integration/fx-team with upstream @ Fri Nov  7 12:34:47 PST 2014