Merge branch 'master' into MessageCounts
Merge branch 'MessageCounts' of https://github.com/bcbarnes-gmx/k-9 into MessageCounts