Sync'd branch integration/fx-team with upstream @ Fri Sep 12 15:07:36 PDT 2014