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