2.11.1

resubmit of  #128, all TODOs addressed

review by @lrytz