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