Sync'd branch integration/fx-team with upstream @ Tue Aug 26 05:06:26 PDT 2014