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