Sync'd branch integration/fx-team with upstream @ Mon Nov 10 22:13:55 PST 2014