Sync'd branch integration/fx-team with upstream @ Tue Oct 14 07:04:45 PDT 2014