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