Sync'd branch integration/fx-team with upstream @ Tue Nov 11 08:20:59 PST 2014