Sync'd branch integration/fx-team with upstream @ Thu Oct  2 23:16:41 PDT 2014