Sync'd branch integration/fx-team with upstream @ Tue Nov 11 15:12:01 PST 2014