Sync'd branch integration/fx-team with upstream @ Thu Oct 30 17:05:17 PDT 2014