Sync'd branch integration/fx-team with upstream @ Tue Aug 26 08:53:24 PDT 2014