Sync'd branch integration/fx-team with upstream @ Mon Nov 10 14:30:01 PST 2014