* NEW: #1
* NEW: #2
Merge branch 'master'; commit '0b9bc33' into dev1