Fix gcc 5.4 build#65

mlamarre wants to merge 4 commits intomitsuba-renderer:mastermitsuba-renderer/mitsuba:masterfrom

mlamarre:fix_gcc_5.4_buildmlamarre/mitsuba:fix_gcc_5.4_buildCopy head branch name to clipboard