Sync'd branch integration/fx-team with upstream @ Wed Sep  3 14:32:53 PDT 2014