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