Sync'd branch integration/fx-team with upstream @ Fri Oct 10 06:07:45 PDT 2014