Sync'd branch integration/fx-team with upstream @ Wed Sep 10 15:10:39 PDT 2014