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