Sync'd branch integration/fx-team with upstream @ Wed Aug 27 06:24:37 PDT 2014