Sync'd branch integration/fx-team with upstream @ Fri Oct 24 18:40:47 PDT 2014