Merge remote-tracking branch 'origin/master'

Conflicts:
	StorageTask.ser

Just small changes to the working