Sync'd branch integration/fx-team with upstream @ Tue Nov 11 11:39:00 PST 2014