Sync from reddit master

To get latest codes.