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