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