general: fixes
Merge branch 'master' of http://github.com/MitsubaBBS/Mitsuba