Merge POP3 changes into master