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