Sync'd branch integration/fx-team with upstream @ Thu Oct 30 03:28:39 PDT 2014