Sync'd branch integration/fx-team with upstream @ Tue Nov  4 02:14:40 PST 2014