Sync'd branch integration/fx-team with upstream @ Tue Nov  4 06:54:57 PST 2014