Sync'd branch integration/fx-team with upstream @ Wed Sep 10 06:53:36 PDT 2014