Sync'd branch integration/fx-team with upstream @ Wed Sep 17 09:12:36 PDT 2014