Merge remote-tracking branch 'upstream/master' into Providers-API
Merge upstream/master
Providers API
fixes for providers
Proper C++ singletons
Merge pull request #41 from MailCore/Providers-API

Providers api