Updated core to rev 11, reflecting decisions on issues #88 and #99