Sync'd branch integration/fx-team with upstream @ Thu Aug 28 18:22:35 PDT 2014