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