Added @mindlace for work on #922. Thx!