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