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