Sync'd branch integration/fx-team with upstream @ Wed Aug 27 07:40:33 PDT 2014