bugfix
Another bugfix
Merge branch 'rel-1.2'
Added c
Added d.txt
Merge branch 'rel-1.2'