Sync'd branch integration/fx-team with upstream @ Fri Aug 22 18:07:34 PDT 2014