Sync'd branch integration/fx-team with upstream @ Fri Oct 31 06:30:43 PDT 2014