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