4
4
Merge remote-tracking branch 'origin/master'

Conflicts:
	plugins/ca.purplemad.wallpaper/src/ca.purplemad.wallpaper.iml
49