Sync'd branch integration/fx-team with upstream @ Wed Sep  3 00:16:34 PDT 2014