Sync'd branch integration/fx-team with upstream @ Fri Sep 12 06:38:37 PDT 2014