Sync'd branch integration/fx-team with upstream @ Thu Oct 30 12:16:35 PDT 2014