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