Sync'd branch integration/fx-team with upstream @ Fri Aug 29 11:10:34 PDT 2014