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