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