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