Sync'd branch integration/fx-team with upstream @ Thu Oct 16 07:16:45 PDT 2014