Sync'd branch integration/fx-team with upstream @ Thu Sep  4 20:12:32 PDT 2014