Sync'd branch integration/fx-team with upstream @ Fri Nov  7 01:06:42 PST 2014