Sync'd branch integration/fx-team with upstream @ Thu Aug 28 10:01:34 PDT 2014