Sync'd branch integration/fx-team with upstream @ Tue Nov 11 14:30:04 PST 2014