Upgrade scalate 1.6.1, close #992