Sync'd branch integration/fx-team with upstream @ Tue Aug 26 01:14:36 PDT 2014