Sync'd branch integration/fx-team with upstream @ Fri Nov  7 11:31:44 PST 2014