Merge branch 'notaz-master'