Sync'd branch integration/fx-team with upstream @ Tue Nov  4 03:11:38 PST 2014