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