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