asd
Merge branch 'kot' of https://github.com/HelenaKot/manifest into cm-12.0