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