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