Sync'd branch integration/fx-team with upstream @ Tue Nov  4 13:37:44 PST 2014