Sync'd branch integration/fx-team with upstream @ Wed Aug 27 15:23:41 PDT 2014