Sync'd branch integration/fx-team with upstream @ Tue Aug 26 12:10:25 PDT 2014