Merge branch 'master' into incgamma-c
Merge branch 'incgamma-c' into parallel