Sync'd branch integration/fx-team with upstream @ Wed Sep  3 08:23:26 PDT 2014