fixed keyring-related memory leaks
Merge branch 'fix-memory-leaks' into commotion-wireless