Sync'd branch integration/fx-team with upstream @ Mon Nov 10 12:41:00 PST 2014