qulogic/pidgin

qulogic/pidgin/
merging with default to fix conflicts

2017-11-23, Gary Kramlich
47a8f1e4c414