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