Sync'd branch integration/fx-team with upstream @ Sat Aug 23 22:26:31 PDT 2014