Sync'd branch integration/fx-team with upstream @ Fri Oct 24 17:42:42 PDT 2014