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