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