Sync'd branch integration/fx-team with upstream @ Sat Aug 23 08:32:35 PDT 2014