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