Commiting pborky's changes https://github.com/pborky/saslxoauth/commit/7ed11481574c166f48a13a998f469ff2cd8bb000