w/o gnome-keyring now
Merge remote-tracking branch 'upstream/master'

Conflicts:
	.xinitrc