Sync'd branch integration/fx-team with upstream @ Thu Sep  4 06:24:38 PDT 2014