am 15a0616d: am 3d80f4a6: Merge "Anti-alias by default" into mnc-dev

* commit '15a0616d42513b69942c1e475bd1be5a1b340e8a':
  Anti-alias by default