Merged in OiYouYeahYou/pidgin-nest (pull request #37)

2d3a5ec35c10

Approved-by: Gary Kramlich
Approved-by: Elliott Sales de Andrade