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