Sync'd branch integration/fx-team with upstream @ Tue Nov 11 10:43:54 PST 2014