Remerge lua52 with master