Sync'd branch integration/fx-team with upstream @ Wed Sep 24 15:44:41 PDT 2014