1.6.x update by Meringue - v4.1
