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