Update from master; resolve a few merge conflicts.
Update from master; resolve a few merge conflicts.

youprofit/parrot,youprofit/parrot,youprofit/parrot,youprofit/parrot,FROGGS/parrot,FROGGS/parrot,tkob/parrot,tkob/parrot,tkob/parrot,FROGGS/parrot,tkob/parrot,youprofit/parrot,parrot/parrot,tkob/parrot,youprofit/parrot,FROGGS/parrot,tkob/parrot,FROGGS/parrot,FROGGS/parrot,parrot/parrot,tkob/parrot,FROGGS/parrot,parrot/parrot,youprofit/parrot,tkob/parrot,youprofit/parrot,FROGGS/parrot,parrot/parrot,parrot/parrot