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