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