Sync'd branch integration/fx-team with upstream @ Thu Sep 25 06:31:35 PDT 2014