Sync'd branch integration/fx-team with upstream @ Wed Sep 10 09:52:42 PDT 2014