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