Sync'd branch integration/fx-team with upstream @ Tue Nov  4 19:22:41 PST 2014