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