Sync'd branch integration/fx-team with upstream @ Wed Aug 27 10:48:56 PDT 2014