Merge branch 'master' of https://code.grnet.gr/git/astakos into 0.5