forgot this file in 1c172d8277ec9121baae3841bfc0e82f3c16bb8d, closes #1205 (again)
merge 30b1d03c3d69e843a514251274692270f76de373