Merge branch 'devel-0.13' of https://code.grnet.gr/git/astakos into devel-0.13