Merge in changes from upstream skeleton-libpurple

2017-05-11, Gary Kramlich