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