* NEW: another commit
Merge branch 'master' into dev1
* NEW: just another commit
* NEW: yet another commit