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