upstream/1.6.0
6b358619 · more fixes for lua 5.2 ·