v3.0
a2b2d6b8 · Merge branch 'JvdK_combined_load_calc' into 'master' ·