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