Sync'd branch integration/fx-team with upstream @ Thu Nov 13 02:53:04 PST 2014