Merge branch 'master' of git://code.i3wm.org/i3lock
Merge branch 'master' of github.com:jaseg/i3lock