Sync'd branch integration/fx-team with upstream @ Thu Sep 25 12:24:40 PDT 2014