Diff slock-1.4-r1 with a slock-1.5

Thank you!