Sync'd branch integration/fx-team with upstream @ Tue Nov  4 10:08:33 PST 2014