Sync'd branch integration/fx-team with upstream @ Fri Oct 31 13:51:05 PDT 2014