Merge pull request !2 from shenmo/auto-4915358-master-8749a79f
Merge pull request !1 from Riceneeder/auto-7828755-master-e346c694